From: Christian Ohler <ohler@gnu.org>
Date: Thu, 13 Jan 2011 08:08:58 +0000 (+1100)
Subject: Merged from trunk.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~5215^2
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=8f3abba542ada1674a88653c0aaaf63aed8a000a;p=emacs.git

Merged from trunk.
---

8f3abba542ada1674a88653c0aaaf63aed8a000a
diff --cc lisp/ChangeLog
index 4005350893c,a1b7a4e6c32..3519e3b9956
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,7 -1,32 +1,36 @@@
 +2011-01-13  Christian Ohler  <ohler@gnu.org>
 +
 +	* emacs-lisp/ert.el, emacs-lisp/ert-x.el: New files.
 +
+ 2011-01-13  Chong Yidong  <cyd@stupidchicken.com>
+ 
+ 	* font-lock.el (font-lock-verbose): Default to nil.
+ 
+ 2011-01-13  Chong Yidong  <cyd@stupidchicken.com>
+ 
+ 	* simple.el (sendmail-user-agent-compose): Move to sendmail.el.
+ 	(compose-mail): New arg RETURN-ACTION.
+ 	(compose-mail-other-window, compose-mail-other-frame): Likewise.
+ 
+ 	* mail/sendmail.el (mail-return-action): New var.
+ 	(mail-mode): Make it buffer-local.
+ 	(mail-bury): Obey it.  Move special Rmail window handling to
+ 	rmail-mail-return.
+ 	(mail, mail-setup): New arg RETURN-ACTION.
+ 	(sendmail-user-agent-compose): Move from simple.el.
+ 
+ 	* mail/rmail.el (rmail-mail-return): New function.
+ 	(rmail-start-mail): Pass it to compose-mail.
+ 
+ 2011-01-12  Chong Yidong  <cyd@stupidchicken.com>
+ 
+ 	* menu-bar.el (menu-bar-custom-menu): Tweak Mule and Customize
+ 	menus.  Add menu item for customize-themes.
+ 
+ 	* cus-theme.el (customize-themes):
+ 	* emacs-lisp/package.el (package--list-packages): Use
+ 	switch-to-buffer.
+ 
  2011-01-11  Johan Bockgård  <bojohan@gnu.org>
  
  	* emacs-lisp/unsafep.el (unsafep): Handle backquoted forms.